Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Sun, 15 Jan 2023 03:57:20 +0000 (11:57 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 15 Jan 2023 03:57:20 +0000 (11:57 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 15 Jan 2023 03:57:20 +0000 (11:57 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 15 Jan 2023 03:57:20 +0000 (11:57 +0800)
diff --cc configure.ac
Simple merge
diff --cc lisp/net/eww.el
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/fns.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 15 Jan 2023 03:57:20 +0000 (11:57 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 15 Jan 2023 03:57:20 +0000 (11:57 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/eww.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/fns.c	patch \|	diff1 \|	diff2 \|	blob \| history